From: Keir Fraser Date: Fri, 20 Mar 2009 08:57:23 +0000 (+0000) Subject: x86_64: Fix handling of DIRECTMAP_VIRT_START in virt_to_maddr(). X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13992^2~16 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=f33c258bababe9b8bb1382ef0437f1caa310a292;p=xen.git x86_64: Fix handling of DIRECTMAP_VIRT_START in virt_to_maddr(). Signed-off-by: Xiaowei Yang --- diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index ac44a9a1c1..8899fe777c 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -40,7 +40,7 @@ static inline unsigned long __virt_to_maddr(unsigned long va) ASSERT(va >= XEN_VIRT_START); ASSERT(va < DIRECTMAP_VIRT_END); ASSERT((va < XEN_VIRT_END) || (va >= DIRECTMAP_VIRT_START)); - if ( va > DIRECTMAP_VIRT_START ) + if ( va >= DIRECTMAP_VIRT_START ) return va - DIRECTMAP_VIRT_START; return va - XEN_VIRT_START + xen_phys_start; }